bitkeeper revision 1.1159.273.3 (423d44f5mg2mqgtSGUZfZFYsYmHuMA)

Primary floppy controller is at port 0x3f0, not 0x340.
Signed-off-by: Keir Fraser <keir@Xensource.com>

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h
index aaa4747b589a885845d7204ff5efd27a8f14d007..ff838f21fb74753b07769a246b3570c580452dbd 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h
@@ -186,7 +186,7 @@ static int xen_floppy_init(void)
 {
        use_virtual_dma = 1;
        can_use_virtual_dma = 1;
-       return 0x340;
+       return 0x3f0;
 }
 
 /*